Update to patch 4.3.30
Merge branch 'master' into drobofs