Added tag 0.5-25 for changeset d0b5ca0f1025e41c511862460b0a54bc9d41ec0d