Merge branch 'master' into eg210
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Fri, 1 Apr 2016 19:03:07 +0000 (12:03 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Fri, 1 Apr 2016 19:03:07 +0000 (12:03 -0700)

Trivial merge