Merge branch 'newfeatures' into 'master'