0.3.15
Merge branch 'feature/0.3.15' into develop