Issue1076

Updates for issue #1076.  Early pull request for the sake of transparency (get it?).  CC @mramato.