Identify map- and vector-like objects in a VS14-compatible way
Another VS14 fix
Merge remote-tracking branch 'dropbox/master'

Conflicts:
	json11.hpp