Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration