kjl
Merge branch 'release-1.1'

Conflicts:
	a