Updating to v7 commit 04May14 after some local repo corruption.