Merge bc6127b5bdbd5ce16133a6493ee6e66036f70ace into 236be1cb44e39e242128fb62c2c38a4decfbdf33
Travis build 45