Merge branch 'new/bug11159' into 3.14.x
authorGalen Charlton <gmc@esilibrary.com>
Fri, 8 Nov 2013 16:29:36 +0000 (16:29 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Fri, 8 Nov 2013 16:29:36 +0000 (16:29 +0000)

Trivial merge