[@Yvain] Looks good to me, approved =)

EDIT: XD This CS is putting up quite the fight