Merge stdout change to master