Merge "Updating master to 1.1.0-SNAPSHOT"