Merge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_...