Merge branch 'dev'
reverted biber-specific travis.yml
Merge branch 'master' into dev