Merge branch 'master' of https://github.com/senbox-org/snap-desktop into flex_reader_BL