Merge pull request #1724 from jmcd73/4_6_x