Merge branch 'dev'
Bump version to 0.11.2-SNAPSHOT for next release