avoid nested for loops in list comprehensions
Merge branch 'releases'

Conflicts:
	obspy/station/inventory.py