Fixes Eclipse / STS support.
Merge commit 'cfafa75c9afdbc85122341bb2417c2fc1964f921' into HEAD