Merge branch 'new/bug11205' into 3.14.x
authorGalen Charlton <gmc@esilibrary.com>
Sat, 9 Nov 2013 16:31:02 +0000 (16:31 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Sat, 9 Nov 2013 16:31:02 +0000 (16:31 +0000)

Trivial merge