flake8
flake8
flake8: some update in flake8/pyflakes in travis makes it complain about
comments that start with no space after the hash sign. we have roughly
700 appearances of that. while this is indeed ugly and should be fixed,
it's too much ado right now (and would be a crazy ammount of work with
merging into master...), so for now just ignore this.
Merge remote-tracking branch 'upstream/releases'

Conflicts:
	obspy/core/util/testing.py
	obspy/fdsn/client.py
	obspy/imaging/scripts/mopad.py
	obspy/xseed/tests/test_blockettes.py
	obspy/y/core.py
fix flake8 commit
Merge remote-tracking branch 'upstream/releases'