Merge pull request #3140 from aTanW/master
authorHannu Nyman <hannu.nyman@iki.fi>
Mon, 5 Sep 2016 06:40:25 +0000 (09:40 +0300)
committerGitHub <noreply@github.com>
Mon, 5 Sep 2016 06:40:25 +0000 (09:40 +0300)
joe: bump to upstream v4.3


Trivial merge