Merge branch 'master' of git://git.eclipse.org/gitroot/amp/org.eclipse.amp