Merge "DO NOT MERGE: make makefile match master branch" into pi-car-dev