Pull from 'aspectj' branch.