Merge pull request #926 from gmaxwell/master