Reinstate MAYBE_GHC_PWD pending a proper solution so we don't break master-merge-ios
Merge branch 'master-merge-ios' into global-adjustor-pool