Patches pushed as c21ad767d4368dbd9ff37a6fd5cdea8aa37fec57 and following
with a few modifications on some URIs and descriptions.
Thanks.