Fixing the hotfix script.
Merge branch 'hotfix/2014-12-02test'