Merged contents of RFC7083 - ticket #51.