pushing to 1.1.4
Merge branch 'master' into fix/infusion-nil-content-type