English
Merge branch 'master' into ice-cream-sandwich
fixed possible crash
Merge branch 'master' into ice-cream-sandwich
added filechooser branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into filechooser