Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle