Merge branch 'master', remote-tracking branch 'origin/master'
add `package.exs` that got waylaid