Merge pull request #1839 from krauseo/4_6_x
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 12 Sep 2014 17:14:53 +0000 (13:14 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 12 Sep 2014 17:14:53 +0000 (13:14 -0400)
4 6 x


Trivial merge