asereje
Merge remote-tracking branch 'origin/master' into memory-leak-fix1