Merge branch 'master' into private/eclipse-4.7