Bug 913217 [merge]