Please refrain from pushing anything to the 2.1 branch for the next couple of days. I'm in the process of merging patches in from master and it will make my life easier if the tree remains static. thanks rob