Portals only show up when you can enter them
Merge remote-tracking branch 'origin/master'