Final 0.2.5 for Helios
Merge branch 'develop' into helios