Add wait-to-finish for SPA (bug 1024451)
Merge pull request #493 from muffinresearch/add-wait-for-spa

Add wait-to-finish for SPA (bug 1024451)