Merge pull request #1840 from krauseo/4_6_x
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 12 Sep 2014 17:55:21 +0000 (13:55 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 12 Sep 2014 17:55:21 +0000 (13:55 -0400)
haxtuple placeholder for 18023


Trivial merge