Merge branch 'master' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 9 Apr 2014 23:59:44 +0000 (01:59 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 9 Apr 2014 23:59:44 +0000 (01:59 +0200)

Trivial merge