Merge master 'dev'
Bump version to 0.7.15