Update to work with Boot 1.1.5