Merge pull request #632 from Grunthos/master

5.1 Release
Merge github.com:eleybourn/Book-Catalogue