Code

Merge remote-tracking branch 'origin/pr/998'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)

Trivial merge