Merge branch dev
Merge branch 'master' of github.com:shgysk8zer0/core