Bug 883944 [merge]