Stable 0.2.4
Merge branch 'release/0.2.4' into stable
Merge branch 'stable'
Promote to 0.2.5-SNAPSHOT