Merge pull request #1840 from krauseo/4_6_x