Merge proposals

staden-io-lib-trunk has no merge proposals.