align with public release

I don't even know Bonita! :)
Merge pull request #277 from ajschumacher/patch-1

align with public release