Merge branch 'master' into terencehill/verbose_notification_fix
authorMario <zacjardine@y7mail.com>
Sat, 22 Nov 2014 06:48:42 +0000 (17:48 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 22 Nov 2014 06:48:42 +0000 (17:48 +1100)

Trivial merge