0.1.0-mjumbewu-6

Reconciling with latest changes from @wbond, so that we never get too out of sync.