7.x-1.2 - several updates