Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-fixes-for-3.1-141118...