pulling changes into code base.

another two commits pulled into code base.