Control Panel: listing blocks minor fix related to php-warnings
Control Panel: location edit page minor fix related to php-warnings
Merge remote-tracking branch 'origin/1.1.8' into 1.1.8