Merge pull request #190 from wmathurin/unstable

Merge from master (changes for v1.4.2 patch)