6.5-beta.9: android 341, desktop 136

6.5-beta.8: android 340, desktop 135

cli: fix build

6.5-beta.7: android 339, desktop 134

6.5-beta.6: android 338, desktop 133

v6.4.11: android 336, desktop 132

Merge branch stable into stable-android

6.5-beta.5: android 335, desktop 131

Merge branch 'master' into master-android

v6.4.10: android 333, desktop 130