Merge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle