Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle