Merge pull request #1785 from bendiy/4_6_x