Merge ordering fixes and PHP cleanups
authorKonrad Rosenbaum <konrad@silmor.de>
Sun, 27 Sep 2015 15:57:05 +0000 (17:57 +0200)
committerKonrad Rosenbaum <konrad@silmor.de>
Sun, 27 Sep 2015 15:57:05 +0000 (17:57 +0200)

Trivial merge