Nils Adermann 287419f6a0 Merge branch 'master' into 2.0 %!s(int64=6) %!d(string=hai) anos
..
functional 422a9adb07 images related to new trusty images %!s(int64=8) %!d(string=hai) anos
installer 287419f6a0 Merge branch 'master' into 2.0 %!s(int64=6) %!d(string=hai) anos