Changes suggested by @krischer and @QuLogic
Merge branch 'issue855' of https://github.com/sfieux/obspy into issue855