Changes for 411,412

Merged Martin Lowe requested to merge github/fork/autumnfound/malowe/master/411 into master

Merge request reports