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

Conflicts:
	sunpy/io/jp2.py