3.0.12 changes
version 3.5
Merge branch 'master' into iphone