Merged master and tesseract versions of Boot.scala.