johns update
Merge branch 'john' into qa