Merge branch 'SB' into FB1

Conflicts:
	Test/GitTest/test/test1.php
Merge branch 'FB1' into MB