Merge pull request #489 from spaetow/master

Adding RFC7055 (ABFAB/Moonshot RFC)