Merge pull request #284 from antonblanchard/boot-clocks