Merge branch 'MDL-47979-master-blocks-config' of git://github.com/mudrd8mz/moodle