Merge proposals

Linaro Landing Team: TI has no merge proposals.