Enhancements for IBM gadgets.
Merge pull request #1133 from ryanjbaxter/master

Enhancements for IBM gadgets.