Ready for phpBB 3.1 (gold)
Merge remote-tracking branch 'origin/develop'

* origin/develop:
  Ready for phpBB 3.1 (gold)