Signed-off-by: Bastian Köcher <git@kchr.de> (cherry picked from commit 5378c85677)
5378c85677
SVN-Revision: 21958
SVN-Revision: 13674