Merge branch 'hotfix/fix_0_divide' into develop
Merge branch 'release/release-20140122-1'