Merge remote-tracking branch 'origin' into lwip-next
authorReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 4 Apr 2017 15:14:25 +0000 (17:14 +0200)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 4 Apr 2017 15:14:39 +0000 (17:14 +0200)
Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>


Trivial merge