Merge branch 'dev'
Merge branch 'dev'
Updated README
Merge branch 'master' into dev
Prepare 2.6.1-SNAPSHOT release