Fix #149
Merge branch 'dev' of github.com:plk/biblatex into dev