Preparing for WG submission.
Merge branch 'master' of https://github.com/emcho/trickle-ice