Merge branch 'master' of github.com:fnp/librarian into pretty