Try to get rid of annoying -n from echo -n.
Merge branch 'flint-2.4' into trunk