Updated due to merge with parent project 1.0.0.RELEASE revision.