OS_29116
Merge branch 'master' of https://github.com/dramosti/Magnificus