Merge "Fix visual studio 2013 compiler warnings"