Merge private development branch

In preparation of groovy release (on googlecode).