iscroll 5 merge

Can you pull in some of these fixes for iscroll 5 code?

Best,
Mark