Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Mon, 21 Dec 2015 15:35:09 +0000 (16:35 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Mon, 21 Dec 2015 15:35:09 +0000 (16:35 +0100)

Trivial merge