Cursors are properly refreshed after redisplay
Merge branch 'master' into gh-pages