fixed welt with hotfix
Merge branch 'hotfix/20130829-2321'