Merge branch 'hotfix/1403092685' into develop
hello: bump release version into 5
Merge branch 'release/1403160393'