npm shrinkwrap
Merge branch 'master' into sqlite3-work