Fix compiler errors in Timer on Windows
Fix double_pendulum_with_base.skel
Merge branch 'origin/master'