Merge branch 'master' into int-new

diff --cc proto/babel/config.Y
index 25ce5ba01bcbf01ecc1f4bac1f17067279a43cc8,dcc0847ee2289748927b1bcc4504f4b80396a533..7adfb4bbcd19224da2a57899583f07551c9de6fd
--- 1/proto/babel/config.Y
--- 2/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@@ -22,9 -20,9 +22,10 @@@ CF_DEFINE
  
  CF_DECLS
  
- CF_KEYWORDS(BABEL, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, WIRED,
-       WIRELESS, RX, TX, BUFFER, LENGTH, CHECK, LINK, BABEL_METRIC, NEXT, HOP,
-       IPV4, IPV6)
+ CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
+       TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
 -      BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS, ENTRIES)
++      NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS,
++      ENTRIES)
  
  CF_GRAMMAR