Sync with Fritz

Sorry for the monster pull request ... will use branches now.
Remvoed in qx-mojo-app branch.