Merge pull request #32 from ebarboni/r125

prepare release12.5