Merge pull request #1257 from gcoxmoz/master