Merge branch 'singleinstance' into harmattan