new version
Merge branch 'bloody' into stable-1.x