1.6.1 Branch Merge

Merge In 1.6 branch to master. Straight port not feature update. Installer not building yet.