Reduce tick time on moves, not ticks
Merge branch 'master' into gh-pages