Issue #171 (closed)
requested review from @ftesson
assigned to @ftesson
merged
mentioned in commit ffb8fc1c
mentioned in commit 347e9498
cherry-pick-ffb8fc1c
picked the changes into the branch cherry-pick-ffb8fc1c with commit 6dcec16d
mentioned in commit 6dcec16d