update to 7.x-0.15
Merge branch 'release/7.x-0.15' into develop