added upstream changes between 2.2.10 and 2.2.12
remove dublicated file
added upstream changes between 2.2.10 and 2.2.12 (program / source)
Merge branches 'upstream-2.2.12' and 'master'