Tidier #207 fix
Merge branch 'dev' of github.com:plk/biblatex into dev