Merge proposals

SpirituS has no merge proposals.