0.15

Cleanup
Merge remote-tracking branch 'origin/dev'