Merge pull request #881 from MikePetullo/master