Merge develop changes onto master branch.

Merge develop changes onto master branch.