Updates from dev-candy

Right now, dev-candy is at a more stable point than master.