Recover from some errors after I clean the project.
Merge branch 'master' into the_wanderer