Merged #241 "issue-527: Synchronize changes from upstream Bugtraq"