Updating version to v1.1.4
Merge branch 'release/v1.1.4'

Conflicts:
	VERSION