Merge pull request #1841 from krauseo/4_6_x