Manu branch

See git log