Update to Dough 3
Merge branch 'dough_3'