Merge branch 'hotfix/20140423.0' into develop

ok devel