Refixed things that got lost in merge.
Merge remote-tracking branch 'origin/master'