fixes for 1.0.2

Merged Hervé MENAGER requested to merge master into release

Merge request reports