Merge "Bookings no longer default to 0 days"