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