Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 14:53:29 +0000 (15:53 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Tue, 22 Dec 2015 14:53:29 +0000 (15:53 +0100)

Trivial merge