DEVELOPER-987 Build regeneration slow or broken
Merge pull request #619 from paulrobinson/DEVELOPER-987

DEVELOPER-987 Build regeneration slow or broken