Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev