Import bassosimone/RiDi sources

The HEAD of bassosimone/RiDi is 86546091f7...