optimize how expandInstanceForEnv() merges datastructures
Merge pull request #1120 from drewfish/perf3

optimize how expandInstanceForEnv() merges datastructures
release 0.6.0 (based on 0.5.9pr1-103-g74fdaa2)
update history file
Merge pull request #1134 from lzhan/history

update history file
Fixing broken link.
Merge remote-tracking branch upstream/develop into fix-merge
Merge pull request #1136 from imalberto/fix-merge

Merging #develop into #next after 0.6.0 release