Merge master.
Merge branch 'master' into deployment
Add inertial scrolling for iOS.
Merge branch 'deployment'
Merge add of inertial iOS scrolling.