Small RPL related changes.
Merge remote-tracking branch 'upstream/master' into rpl