Added Citrix as Bronze sponsor
Resolve merge conflict
Merge pull request #1300 from tolomaus/master

Added Citrix as Bronze sponsor