Merge branch 'hotfix/v1.1.5'
Merge branch 'master' into develop
iPad touchmove binding fix
Merge branch 'develop' into hotfix/v1.1.6

Conflicts:
	CHANGELOG.md
Compiled fix
Merge branch 'hotfix/v1.1.6' into develop