merge to upstream Merge branch 'master' of github.com:arrahtec/osdq-desktop
merge to upstream
Merge branch 'master' of github.com:arrahtec/osdq-desktop

arrahtec/osdq-desktop,arrahtec/osdq-desktop,arrahtec/osdq-desktop