[Merge] ~chris.macnaughton/ubuntu/+source/swift:master into ~ubuntu-server-dev/ubuntu/+source/swift:master

[James Page]

Review: Approve


-- 
https://code.launchpad.net/~chris.macnaughton/ubuntu/+source/swift/+git/swift/+merge/385815
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/swift:master.