Merge branch 'chr'
Merge branch 'master' into chr