Update version to code 6 (2.0-alpha-2)
Merge branch '2.0-alpha-2' into content-provider