Merge pull request #1712 from gilmoskowitz/4_6_0-beta-to-master