Merge proposals

doxygen-sid has no merge proposals.