Merge proposals

Linaro has no merge proposals.