Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle