merge upstream master and deal with resolving conflicts

latest commit 72a6250c79
@rnagle rnagle authored