Fixed warnings when compiling with MSVC.
Merge remote-tracking branch 'dirk/master'