Merge remote-tracking branches 'regulator/topic/pv88080', 'regulator/topic/pv88090...
authorMark Brown <[email protected]>
Sun, 19 Feb 2017 16:40:37 +0000 (16:40 +0000)
committerMark Brown <[email protected]>
Sun, 19 Feb 2017 16:40:37 +0000 (16:40 +0000)

Trivial merge