Merge remote-tracking branch 'origin/pr/1168'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sat, 1 Aug 2015 07:09:03 +0000 (09:09 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sat, 1 Aug 2015 07:09:03 +0000 (09:09 +0200)

Trivial merge