Bump version to 4.0.1
Adding line to CHANGELOG
Merge branch 'stable'