Merge branch 'master' into sampler
authorPaul Brossier <piem@piem.org>
Tue, 14 Mar 2017 02:42:40 +0000 (03:42 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 14 Mar 2017 02:42:40 +0000 (03:42 +0100)

Trivial merge