Hi, I'm merging master to frameworks right now. It's a bit complicated this time, so please don't push commits to frameworks until you see today's merge commit, or I'll have to redo the merge. Boudewijn