Shotgun commit
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	MvcSASE/MvcSASE.v12.suo
Revert "Shotgun commit"

This reverts commit 1f26f93227d867331c91ab5df899bb6ff144fea7.