Merge pull request #1 from The-Superman/jb-4.3

Initial 4.3 commit
Merge pull request #2 from The-Superman/master

Merge pull request #1 from The-Superman/jb-4.3