Merge remote-tracking branch 'origin/wip'
authorSebastien Douheret <sebastien.douheret@iot.bzh>
Sat, 26 Aug 2017 09:29:56 +0000 (11:29 +0200)
committerSebastien Douheret <sebastien.douheret@iot.bzh>
Sat, 26 Aug 2017 09:29:56 +0000 (11:29 +0200)

Trivial merge