fix for #392 Part II
Merge remote-tracking branch 'upstream/master'