Code

Merge remote-tracking branch 'origin/pr/1701'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 May 2016 07:15:20 +0000 (09:15 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 May 2016 07:15:20 +0000 (09:15 +0200)

Trivial merge