New development will aim at API level 10
Merge remote-tracking branch 'origin/master'