Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Mon, 6 Jul 2015 22:20:32 +0000 (15:20 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Mon, 6 Jul 2015 22:20:32 +0000 (15:20 -0700)

Trivial merge