* merged from the aj-ftparchive-improvements branch