Merge pull request #57 from rodmcnew/combined-checkouts

fix caching bug
fix biuld
Merge remote-tracking branch 'upstream/master' into combined-checkouts
fix build