Merge branch '0.5.2.5' into master