KVO UIScrollView contentOffset

I merged your master and made the changes again, now automatically merge should work.