cab932f0ed
This updates the doc and git branches to match master instead of feature/1.0. Change-Id: Ifc98157328b2f9f56055fa0cdcfea5db5180fb7f