pulling changes into code base.

aggregate of 4 commits pulled into the master project.