Update haff-rating with master