Fix crash from commit 644d9fc720dbcfbc845c46528ac29dfc80e2c39f
Merge remote-tracking branch 'upstream/master'