iOS scrolling fix
Merge branch 'brassy--master'
fix