I merged all the changes on the oacs-5-0 branch up to the
oacs-5-0-0b4 tag back to HEAD.
I have not really tested
it much so if you see problems it's probably a good idea
to see if it's something that went in via the merge.
I created tags pre-5-0-0b4-to-head and post-5-0-0b4-to-head
on the HEAD branch which bracket the merge.
