Missed project realignment merge into unstable20

Oops.  This change was way back when I was reworking the workspace and iOS projects.  Going directly into unstable20, as that's about to become the branch for iOS now too.