Merge branch 'master' into QA
updates QA with Carl's test commit which was on master branch, but not done in QA