Merged up to commit 12364 (2012-09-11) inclusive.
Notes: Each time you add a new extension in the src directory you must add the extension directory name to src/Makefile.
