Merge branch 'master' into kinetic_scroll