Merge pull request #1044 from sjinks/1.2.3

[1.2.3] Hardening fixes