Pull request to synchronize the "develop" branch with latest WCI fork.

This is hopefully the last such thing we'll have to do to get the repositories right.  After this, all future changes will be done on the "develop" branch and we will remove the "development" branch.