committed 0.3.5-2 (rc3) source
Merge branch 'integration' into develop