Merge "bump version to 1.2.5"