Tweaked lines and dot.
Merge remote-tracking branch 'origin/master' into Jonas2
Merge remote-tracking branch 'origin/master' into shuriken-limit