Code

Applied patch from upstream trunk, changeset:13477