closes #2429
Merge branch 'release/1.15'