Merge pull request #986 from ninjarobot/patch-1