Convert ENV constant to a hash
Merge pull request #710 from ppp0/issue-710

Fix another regression (ENV merge)