reverting master to 1.1-SNAPSHOT

Change-Id: I338c084287a462fb50f65c55de51c872ed2fbce8
7 files changed