Merge branch 'new/bug8854'
authorGalen Charlton <gmc@esilibrary.com>
Tue, 19 Nov 2013 16:12:42 +0000 (16:12 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Tue, 19 Nov 2013 16:12:42 +0000 (16:12 +0000)

Trivial merge