Merged in boxed 1.1.5