Merge branch 'Novafora' of git://git.zytor.com/users/hpa/sparse/sparse into license