- Merge with trunk
- Merge with trunk

Anon215/movim,opi/movim,opi/movim,movim/movim,mickaelandrieu/movim,edhelas/movim,edhelas/movim,mickaelandrieu/movim,Trim/movim,Trim/movim,Anon215/movim,Trim/movim,Trim/movim,Anon215/movim,mickaelandrieu/movim,mickaelandrieu/movim,edhelas/movim,Ppjet6/movim,movim/movim,Ppjet6/movim,Anon215/movim,Ppjet6/movim,movim/movim,opi/movim,edhelas/movim,opi/movim