Merge branch from @matrushka updating the osx build, thanks!
authorPaul Brossier <piem@piem.org>
Tue, 14 Mar 2017 00:14:47 +0000 (01:14 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 14 Mar 2017 00:14:47 +0000 (01:14 +0100)
 empty message aborts


Trivial merge