Updated version number
Merge branches 'new_branch_name' and 'master'
Updated NEWS file
Merge branch 'master' into 4.1-linux-build
Update version number