merges changes in from upstream.
Merge branch 'pmalouin-master'