Merging in Martin's minor improvements

Martin Deimelrequested to merge
github/fork/m-deimel/master into martin-minor-improvements

Created by: AdityaSavara

Changes proposed

Merge request reports