qa3
Merge branch 'chris'