Merge pull request #1311 from pyr/fix/1282