Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ad5398...
authorMark Brown <[email protected]>
Sun, 30 Aug 2015 13:38:50 +0000 (14:38 +0100)
committerMark Brown <[email protected]>
Sun, 30 Aug 2015 13:38:50 +0000 (14:38 +0100)

Trivial merge