test merge from 1.1
Merge branch '1.1'

Conflicts:
	README.md