Prepare for 1.1.4 release
Merge branch 'master' into 1.2

* master:
  Prepare for 1.1.4 release