Kythera Specific test wait function.
Per module compile options, very initial implementation, doesn't work in all cases.
Merge branch 'master' into KytheraSpecific