Merge branch 'master' of git://git.sitka.bclibraries.ca/sitka/sitka-tools