Revert "Revert "Fix compiler warning C4800 in Microsoft VC 2013 Express""

This reverts commit 64dae16b2e2bcf75a73b9eca12c0f57d1a10f82d.