cleanup
more patches
cs
Merge pull request #491 from apigen/patches

Patches