Merge branch 'harmattan-port'