small changes (adding some _deprecated_ annotations)
Authored by: vsp_nagel 2015-03-04
Parent: [r32367]
Child: [r32369]