Reverted 134901 because of 134959. Did not use svn merge -r but rather: