Merge to apply updates

Commits made to detached HEAD. Merge them.
Merge branch 'master' of github.com:shgysk8zer0/core