Merge branch 'w13_MDL-31685_m23_filelocking' of git://github.com/skodak/moodle