Merge package.json update to master

Just merging a commit to master.