fixes #680
Merge branch 'releases'
Merge branch 'master' of https://github.com/obspy/obspy
Merge branch 'master' of https://github.com/obspy/obspy
future.builtins.str => str == unicode