Reverting entwined master commits.
Bumped package.json and repackaged towards release/1.1.7
Merge branch 'release/1.1.7'