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