fixing build errors
Merge branch 'master' of https://atlas-server.oreilly.com/git/1230000000073

* 'master' of https://atlas-server.oreilly.com/git/1230000000073:
  fixing build errors