Merge pull request #2422 from akoeplinger/environment-is64bitoperatingsystem