Merge remote-tracking branch 'origin/master'
# Conflicts: # CHANGELOG.md # npm-shrinkwrap.json # package.json
This commit is contained in:
commit
88cce59f82
# Conflicts: # CHANGELOG.md # npm-shrinkwrap.json # package.json