Fixed regression casued by 25084f528208a5ab8e0f1ebd9ae80527bf0099d1
Merge remote-tracking branch 'origin/master' into rc