mostly done
Merge branch 'master' into eliutt-branch
Merge branch 'eliutt-branch'