Merge pull request #1367 from PawelDecowski/develop

Remove set_time_limit() call. Fixes #1346