There were some change in the last weeks to the 2.1 branch that weren't committed to the 2.2 version. Please make sure that you keep these two branches in sync. Otherwise we will definitly loose updates and bug features when we roll out 2.2.
Thanks Carsten
