ETCH-49 - merge changes from 1.0.2. into trunk
ETCH-49 - merge changes from 1.0.2. into trunk


git-svn-id: fadc92a2e5f700a5cbf547f810915d7a82a23cf8@741247 13f79535-47bb-0310-9956-ffa450edef68

OBIGOGIT/etch,OBIGOGIT/etch,OBIGOGIT/etch,OBIGOGIT/etch,OBIGOGIT/etch,OBIGOGIT/etch,OBIGOGIT/etch,OBIGOGIT/etch