Merge "allow combined width/height param in {{filepath:}}"