1/2 finished portalling
Merge remote-tracking branch 'origin/master'