Updated scm files from source
Merge branch 'upstream' into ubuntu
Added upc_catalan_phones to preserve backwards compatibility
Merge branch 'upstream' into ubuntu
Updated copyright to reflect latest changes in source files