merge of v4.0.1
Fix failing unit test
Merge pull request #1039 from eucalyptus/merging-4.0.1

merge of v4.0.1