Fixed warnings C4800 (VS2013).
Prepared to clear commit.
Merge branch 'fix-warn-c4800' into develop