Add note about 3.0 being merged to master