Fix the timedim correctly this time
Merge branch 'master' into rsr/osx-travis