Merge branch 'MDL-28568_noncontact_warning_23' of git://github.com/andyjdavis/moodle...