reconcile with remote-tracking branch 'md/jb-4.3' into jb-4.3

Change-Id: I19412a902c85da6ffa90d5b97c7a82817af46ba9
ugh! i hate git sometimes