I've committed rev 194091. It brings all the changes to trunk from last week. I will be doing weekly merges from trunk into the branch. To avoid unnecessary spam, I won't announce merges unless something interesting happens. Tested on x86_64. Diego.