Merge branch 'dev_MDL-27289_boxnet_master' of git://github.com/dongsheng/moodle