Added greater conformance to UIScrollViewDelegate
Merged