Merge branch 'R1.0'
in R1.1
Merge from develop for v1.1
after R1.1 in develop
myFeature
release commit
Merge branch 'release/93' of github.com:rchrom/gdc-gitflow into release/93

Conflicts:
	whoami
Merge branch 'release/93' into develop