Fix
Merge branch 'hotfix/2014-10-02-fix'
Merge tag '2014-10-02-fix' into develop

Fix