hotfix 20140721_3
Merge branch 'hotfix/20140720_3' into develop