Merge branch 'master' into Dustin
removing alert
Merge branch 'Dustin'