Merge citrix branch into master.

No match.