Fix for biber #11
Fix #149
Merge branch 'dev' of github.com:plk/biblatex into dev
Revise fix for #149
Revise b6689fa
Merge branch 'dev' into ms