More fixing of print.
Merge branch 'test' into dev