Merge branch 'johnzon-2.0.1-release'