Merge pull request #1556 from mattcasters/master