Merge branch 'master' into Dustin
formatting and datasourceerror dismissing curtain.
Merge branch 'Dustin'
Merge branch 'master' into marty