Issue #1719

I made a small commit ( 60db0fd0fa2d459ee0bb1b43509ac032016de3a5) but got into merge problems.  Tried squash and asking for advice on IRC.  Anyone know how to clean up this PR?