Code

Merge remote-tracking branch 'origin/pr/1254'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)

Trivial merge