fix issues/188
Merge branch '0.49' into 0.50
Merge remote-tracking branch 'upstream/0.50' into 0.50