Commit 2d623257545f8e24f837ee53502a9ebddd786fc4

DRC 2016-02-06T16:03:57

Fix Visual C++ compiler warnings Somehow this got reverted with aa769febf25c64f115c2a237516b0c7d65f651cd. Oops.