Merge branch 'master' into bug1
kp modifies this
Merge branch 'bug1'