Comment 3 for bug 787508

Thanks for your suggested fix, Leif. Looks like you have cleared up the rest. That said, I have not looked at your changes in detail and haven't had time to test them yet. Also I'm wondering why you have removed a reference to barriers in one of the texts.

The reason I didn't touch the remaining strongholds was because I was afraid to break anything, so I'm probably not the best person to review the changes. What do others think? Would it be better to create two merge proposals towards trunk for each branch, to get someone who knows a bit better than me what's going on to review it?