Updated to match Aseba master.