Gh 756

phew!  This has been tested and all tests are passing.    Ready to merge to staging.