Merge branch 'master' into er/ted