CLEANUP_OPTIONS: Revise 'ktest -d'
Merge remote-tracking branch 'upstream/master' into options
Merge remote-tracking branch 'upstream/master'