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

Trivial merge