Merge branch 'chdrost'
Merge branch 'master' into chdrost