Merge branch 'develop' into features/events

Conflicts:
	src/bin/magecli.cpp