thoughts follow up to ddca2816 minor edit
Merge branch 'master' into integration