Missing update from Eyescale:master