faster on ticks, not moves
Merge branch 'master' into gh-pages