tree 0a66a668526de48749e049951cef41691bc11267
parent 2b2e9c23266d738dd92d254ffe79fa641f4271a3
parent 6d39fc0c19a81161147de250434d5689c6ea559f
author Simon Pasquier <spasquier@mirantis.com> 1479466736 +0100
committer Simon Pasquier <spasquier@mirantis.com> 1479466740 +0100

Merge remote-tracking branch 'upstream/master' into merge-branch

Change-Id: Ie8eb16d22bfc8d8a582640dfb2c2ebf691507f7a