Merge branch 'master' into eclipse