Merge pull request #786 from mcmonkey4eva/master

Pull request for priority hotfix