upstream version 2.15
Merge branch 'master' into ic3s