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

Trivial merge