added upstream software - version 2.2.12
Merge branches 'upstream' and 'master'