Merge branch 'MDL-61016_hideif_disabledif' of git://github.com/davosmith/moodle