Fixes by c24b.
FIX by c24b
Merge remote-tracking branch 'upstream/master'