automerge: 07d2f0c * commit '07d2f0cff4d08bec4ff5ea22f9c42532f3c83e35': More debugging for bug 17721767