Merge pull request #1953 from angusding/patch-9