Merge remote-tracking branch 'origin/master'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 6 Nov 2015 17:36:00 +0000 (18:36 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 6 Nov 2015 17:36:00 +0000 (18:36 +0100)

Trivial merge