[ticket/12567] wrap to top

PHPBB3-12567
Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeus

* Senky/ticket/12567:
  [ticket/12567] wrap to top
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12567] wrap to top