Merged in f1ce653.