merged and updated package info
Authored by: vsp_neumann 2014-11-24
Parent: [r31207]
Child: [r31209]