Merge "OS X shell is incompatible with echo -n"