Merge branch '3.14.x'
authorGalen Charlton <gmc@esilibrary.com>
Thu, 21 Nov 2013 02:05:27 +0000 (02:05 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 21 Nov 2013 02:05:27 +0000 (02:05 +0000)

Trivial merge