Merge remote branch 'github-bgk/3.8.21-translate' into HEAD
authorKyle M Hall <kyle@bywatersolutions.com>
Sat, 28 Dec 2013 13:12:41 +0000 (08:12 -0500)
committerKyle M Hall <kyle@bywatersolutions.com>
Sat, 28 Dec 2013 13:12:41 +0000 (08:12 -0500)

Trivial merge