Merge dobots -> mrquincle

Changes made by Bart.