Merge branch 'rfc4760' into fdn-mods