Prep for release
Merge branch 'release/1.1.18' into develop
Fix bug where page change form did not display rows
Merge branch 'develop' of github.com:praekelt/jmbo-foundry into develop