composer is now merged in master