Merge branch 'disruptive-notification' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 27 Feb 2016 09:55:01 +0000 (10:55 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 27 Feb 2016 09:55:01 +0000 (10:55 +0100)

Trivial merge