Merge recursive expressions performance update from Trunk. Merge Makefile update from Trunk. Merge history update.