Merging master 1.1.1.SNAPSHOT