Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle