initialize local variables before use#693

kraj wants to merge 2 commits intoeclipse-upm:mastereclipse-upm/upm:masterfrom

kraj:masterkraj/upm:masterCopy head branch name to clipboard