Changes following Foundation's upgrade to Boot 1.2

Closes #36
Merge branch '1.1.x'