Update nightly to 2.1-1fbf7e2