Merge branch 'jpattoni' into master-qa
Merge branch 'master-qa' into jpattoni