Actually, now we're merging to the BETA branch

Long day, everyone. Very long day.