Prepare for compilation with VC13; size_t => uint32; remove constexpr.
Merge remote-tracking branch 'upstream/master'