Fix Xcode 5 -Wdocumentation warnings from mismatched parameter names/returns
Merge pull request #1453 from erikcharlebois/development

Fix Xcode 5 -Wdocumentation warnings from mismatched parameter names/ret...