Fix
Merge branch 'hotfix/2014-10-02-fix'