Norihiro Tanaka wrote:
> I rebased this patch, and add a bug fix to it.

Thanks.  Paolo wrote it up in <http://bugs.gnu.org/17156#11>, and I just 
now tweaked its ChangeLog and merged the code and installed it (patch 
attached).  I followed up with minor cleanups (2nd patch attached).