Merge tilghman's app/appdata in newexten patch (bug #2104)