Merge remote-tracking branch 'upstream/master' into feedlist

Conflicts:
	docs/libearth.rst
	libearth/codecs.py
	tests/codecs_test.py