Summary of changes: ec629e8... fixed segmentation fault Resolves: #685005 f712e00... fixed some most obvious issues from static analysis 42247ad... fixed some most obvious issues from static analysis a1f7d2b... fixed merging conflicts