Merge branch 'portrait' of https