// Conflict fix for PR #360
Merge branch 'bellini13-patch-7' PR#360