Fork from gittorious with local bug fixes