Merge 0271f01cde08167058836fb632e9e59977390bab into 236be1cb44e39e242128fb62c2c38a4decfbdf33
Travis build 43