Replaced PWD with CURDIR in makefile
Merging with trunk
Merge branch 'master' into rover-servo
Removed incorrect merge traces