Merge remote-tracking branch 'origin/master' into mcts

Conflicts:
	masai14.sln