Merge branch 'bar-cursor' into mymaster