fresh token, silenced diagnostics on command with secure env var
manual merge master into macosx
Merge branch 'macosx' of rubicks.github.com:rubicks/cpp-crapola into macosx