Merge pull request #927 from jp-bennett/master