Issue1076

Updates for issue #1076.  Early pull request for the sake of transparency (get it?).  CC @mramato.

I still need to update Changes.MD, Unit tests, and review for consistency/clarity.