Adding commits from master.

Adding commits from master