Merge branch 'MDL-51205_pix_style' of git://github.com/andyjdavis/moodle