am 71f5d130: Merge change 1739 into donut

Merge commit '71f5d130f5d2c512cc811f538b4d0f6613451973'

* commit '71f5d130f5d2c512cc811f538b4d0f6613451973':
  Fix an NPE in the New Project Wizard when no test project is specified