Minor fixes for Moodle 2.5 compatibility
Fix to version.php
Merge branch 'master' into 02-support_osce_marks