Pending changes
Merge branch 'master' of github.com:yireo/MageBridgeCore