Bug 26870 - add width/height param to {{filepath:}}