Merge branch 'calamares' of https://github.com/calamares/calamares into development

CHANGES

CMakeLists.txt

src/libcalamares/utils/Variant.cpp

src/libcalamares/utils/Variant.h

src/modules/keyboard/KeyboardPage.cpp

src/modules/packagechooser/PackageChooserPage.cpp

src/modules/packagechooser/PackageModel.cpp

src/modules/packagechooser/packagechooser.conf