Line Endings
Re-Fixed depency test of avatar (previous changes got lost during rebase)