New version: 1.2.5

Change-Id: I39fbbb74844dacb70b0b0cbeb681cc13db0b78cc