void
Merge branches 'aviso', 'master' and 'atl' into madeleine
void
void
void
void
void
void
void
Merge branch 'madeleine'
void