actually bump version number to 1.1.4 #26
Merge branch 'master' into develop