Bug 919371 - Make sure marker frames get the right parent. r=cam
Automatic merge