Merge proposals

Michael Hartl has no merge proposals.