Integration of various branches into a useful updated bundle.