Fix crash #202
Merge remote-tracking branch 'upstream/master' into fix_202
Merge pull request #281 from ctrlaltca/fix_202

Fix crash #202