Import nvi-1.81.6 + HEAD-2013-11-20 from git://repo.or.cz/nvi.git