Merge branch 'develop' into accelerate
authorPaul Brossier <piem@piem.org>
Sat, 5 Sep 2015 09:55:53 +0000 (11:55 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 5 Sep 2015 09:55:53 +0000 (11:55 +0200)

Trivial merge