beta version => 2.0 beta 12
Merge branch 'master' into ice-cream-sandwich