Sync with sources

This can merge perfectly :O Day made!