Imported Upstream version 13.12