Update portrait
Merge branch 'master' into ruby-classes