Cilantro 2.2.25
Merge pull request #603 from cbmi/cilantro-2.2.25

Cilantro 2.2.25