Fix for setInterval and setTimeout
Merge branch 'develop'