Imported Upstream version 1.2.1+svn~57448
Merge branch 'upstream'