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