Merge pull request #832 from pganssle/merge_2.7.5

Port over 2.7.5 release