Merge remote branch 'github-bgk/3.12.14-translate' into HEAD
authorKyle M Hall <kyle@bywatersolutions.com>
Fri, 25 Jul 2014 16:39:16 +0000 (12:39 -0400)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 25 Jul 2014 16:39:16 +0000 (12:39 -0400)

Trivial merge