Merge branch '1.10-docker'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 29 Nov 2016 13:13:15 +0000 (13:13 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 29 Nov 2016 13:13:15 +0000 (13:13 +0000)

Trivial merge