Merge branch 'bbalentine'
Merge branch 'master' into bbalentine