Version 0.3k4
Merge remote-tracking branch 'upstream/master' into wait-options