fix name clash introduced with #859
Merge branch 'releases'

Conflicts:
	obspy/core/tests/test_trace.py