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

Trivial merge