Merge branch 'hotfix/20140423.0' into develop

ok devel
Merge pull request #1 from hannymahfuz/develop

Merge branch 'hotfix/20140423.0' into develop