Merge branch 'alexdesktopworking' of https://github.com/sugarcubes/SugarCubes into...