Merges from main branch git://github.com/tibistibi/mTor.gi