Parts of the previous patch http://patchwork.ozlabs.org/patch/367967/ were incorporated already. Adjusted the rest - hopefully it will be pulled-in as well. cheers, Max.