Merge Atyanar/master into hpi-swt2/Biber, ref #20