Merge branch 'hotfix/2013_08_06_hotfix'