Merge pull request #717 from MikePetullo/master