Merge pull request #677 from syseleven/fix-4913