fixes #347
merge conflict in blacklight configuration -- Mark, Ole, please review