beaton commit

6/3/13 branch commit