Build: #505 was successful Changes by Eric Milles