Merge branch 'master' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Thu, 10 Apr 2014 06:46:26 +0000 (08:46 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Thu, 10 Apr 2014 06:46:26 +0000 (08:46 +0200)

Trivial merge