Merge branch 'dev'
Name change, round 1
Remove Blamlib dependency