updates for revised handling of "master"
Merge origin/master