Merge remote-tracking branch 'github/master'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Aug 2016 23:25:01 +0000 (00:25 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 15 Aug 2016 23:25:01 +0000 (00:25 +0100)

Trivial merge