Merge pull request #839 from TheAngularity/patch-1