Fixed output
Updated
Prepare release
Merge branch 'master' into 1-4-stable