Further updates following Foundation's move to Boot 1.2 snapshots
Merge branch '1.1.x'