Merge pull request #947 from MikePetullo/master