Merging release/0.2.1 into develop.

Merging release/0.2.1 into develop.  We need these changes in, before creating branch release/0.2.2.