Merge remote-tracking branch 'yawning/bug16674'