Imported Upstream version 2013.1.3+realorig