Bug fixing.
Merge commit '4b8ce32c0cabe810b9149e8bf3ced44999cd0f00'

Conflicts:
	Dev/Source/Test/main.cpp