[packages_10.03.2] subversion: merge r28765, r29067