Pilus/Gryphonheart — pull request #6 by Pilus (2013-09-30 12:41:36+00:00)
Title: 443 ghm cleanup

Merging in GHM cleanup to avoid further conflicts.