[master] bugfix
Merge branch 'master' of github.com:hell0again/oreore_rc into core