Merge pull request #1776 from aTanW/master
authorSteven Barth <steven@midlink.org>
Tue, 15 Sep 2015 12:23:02 +0000 (14:23 +0200)
committerSteven Barth <steven@midlink.org>
Tue, 15 Sep 2015 12:23:02 +0000 (14:23 +0200)
joe: bump to upstream v4.1


Trivial merge