Merge branch 'sitka_2_8'
authorChristine Burns <christine.burns@bc.libraries.coop>
Mon, 6 Jul 2015 21:27:39 +0000 (14:27 -0700)
committerChristine Burns <christine.burns@bc.libraries.coop>
Mon, 6 Jul 2015 21:27:39 +0000 (14:27 -0700)

Trivial merge