Meging master changes to maven branch. ( last commit b7bddd6)