Bug 838192. Added screenshot support