Merge pull request #336 from sglaser/feature/overrideLogo

add overrideLogo support
Merge branch 'w3c-develop' into pcisig-develop

* w3c-develop: