Prepare release
Merge branch 'master' into 1-5-stable