Control Panel: saving custom layout for categories bugfix
Merge remote-tracking branch 'origin/1.1.6' into 1.1.6