2.16 fix showstopper
Merge remote-tracking branch 'origin/master'