Merge branch 'release/0.11.4.pre2' into develop
Bumped server version to 0.11.4
Merge pull request #93 from calabash/release/0.11.4

Release/0.11.4