Minor fixes
Fix memory leak and segmentation fault in rare cases
Merge branch 'master' into develop
Strip an unreached return statement
Minor style improvement
Merge branch 'develop' into release-1.4