Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/libserialize/json.rs
Merge branch 'master' of https://github.com/cybergeek94/rust