defect 2575
Merge branch 'master' into Kevin