Merge pull request #1839 from krauseo/4_6_x