Merge branch 'develop'

Merge branch 'develop'

Revert "fix name clash with forced_unwind"

This reverts commit 094f4ca.

Merge branch 'develop'

function executed by resume_with() has to return a continuation

Merge branch 'develop'

Fix various syntax errors caused by merging+edits.

Just clobber master version with develop version as the master had issues caused by whatever merge was done on this earlier. And then not truly fixed by further edits.

Merge branch 'develop'

Merge branch 'develop'

Merge branch 'develop'