merge kivy master into electrum