Fix setup (warnings and errors from page2.php)
Merge remote-tracking branch 'origin/develop' into editor