Merge proposals

Pierre Lamarche (www.savoirfairelinux.com) has no merge proposals.