Merge branch 'us/printf-not-echo'