Allow 0 value for pageX
Merge develop into mwean-develop
Merge branch 'mwean-develop' into develop

* mwean-develop:
  Allow 0 value for pageX