Editor's drafts for fix_indent branch of scionassociation/scion-dp_I-D