Update with updates from the trunk between rev 2094:2155
Mainly differencise related to makeorchidee_fcm and orchidee.default.