Fix problems with dynamically figuring out the project name.
Merge branch 'master' into african-lions