Merge branch 'alex'
Merge branch 'master' into alex
lots of changes