Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 22:12:00 +0000 (15:12 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Tue, 30 Jun 2015 22:12:00 +0000 (15:12 -0700)

Trivial merge