Merge branch 'develop' into '6452-uncaught-typeerror-array_merge-argument-1-must-be-of-type-array-bool-given-in' # Conflicts: # server/lib/classes/file.inc.php
