Identify map- and vector-like objects in a VS14-compatible way
Another VS14 fix
Style fixes
fix int->double->int conversion in JsonInt
merged in upstream