Merging Integrate-skroller into master

I'm creating a pull request to merge Integrate-skroller into mainline.