Final release version 15
Merge branch 'master' into develop