Merge branch 'master' into marty
Cleaned up alert messages
Merge branch 'marty'