- Merged v153 and 154 as 153

Signed-off-by: Stéphane Mons <st.mons.lists@free.fr>