Merge remote-tracking branch 'origin/leon'

Conflicts:
	php/createThumbs.php
Revert "Merge remote-tracking branch 'origin/leon'"

This reverts commit 5f056c424f807cadd7e4b1118e6ec9f3d665738a.