Merge "Shell: Don't hang on empty stdin"