Merge branch 'master-qa' into jpatonni
Merge branch 'jpatonni' into master-qa