Merge branch 'master' into Dustin
Tear off bug
Merge branch 'Dustin'