Traiansf review2

Ok, I did not know how to do this better, so I first merged master into unified-builtins (rebasing was simply unacceptable: it required me to resolve conflicts which I already had during previous rebase operations).
Once I merged, I simply branched from the merged branch and things became much simples as shown by this pull request.
If there is a better way, please let us know --- the instructions on the wiki seem to cover only patches to master.