Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle