Build #391

Build: #391 failed Changes by Stephane Maldini <smaldini@pivotal.io>