Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Wed, 1 Jul 2015 00:13:43 +0000 (17:13 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Wed, 1 Jul 2015 00:13:43 +0000 (17:13 -0700)

Trivial merge