merged in Docblock refactoring from dlsniper