Merge branch 'new/bug11240' into 3.14.x
authorGalen Charlton <gmc@esilibrary.com>
Thu, 14 Nov 2013 23:08:15 +0000 (23:08 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 14 Nov 2013 23:08:15 +0000 (23:08 +0000)

Trivial merge