I've pushed a couple of commits to the branch.

This looks OK to me. I tried dig manually for leaks, but didn't run
system tests. If system tests pass, please go ahead and merge.

		Mukund