Merge branch 'master' into eg28
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Tue, 16 Jun 2015 19:14:50 +0000 (12:14 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Tue, 16 Jun 2015 19:14:50 +0000 (12:14 -0700)

Trivial merge