Gh 965

Tested this locally on branch gh-965.  ready to merge.