Corrected print function
Merge branch 'master' into 3.x