haxtuple placeholder for 17921
Merge pull request #1 from shackbarth/keith1

Keith1
Merge pull request #1839 from krauseo/4_6_x

4 6 x