Merge remote-tracking branch 'origin/swtbot' into swtbot
test updates