Updates in line with core.
Merge branch 'gjb2048-master_mdl_updates'
#305 merged manually