v1.1.2
Merge commit '6b6a3f9' into develop

Conflicts:
	README