Merge branch 'release/0.2.5' into stable
Merge branch 'stable'