Merge branch 'rel_2_3'
authorGalen Charlton <gmc@esilibrary.com>
Fri, 31 Jan 2014 21:40:58 +0000 (16:40 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Fri, 31 Jan 2014 21:40:58 +0000 (16:40 -0500)

Trivial merge