Merge in release 0.7.5