Merge pull request #176 from wmathurin/unstable23

Latest from unstable