Shun Miyazawa 0121a8f5b9 Merge branch 'master' into imprv/thread-history hai 9 meses
..
locales 0121a8f5b9 Merge branch 'master' into imprv/thread-history hai 9 meses