same mods as in e57f2ba
Merge remote-tracking branch 'origin/CEST2014' into CEST2014