Merge in changes from old repository into new beehiveforum branch.
Add scopes to class properties and methods to allow proper functionality when used with Beehive's error handler.