Badges.
Line endings.
Merge from master.