Merge pull request #2138 from joshuaruesweg/patch-84