Merge shit jb

Jani Bizjakrequested to merge
merge_shit_jb into master

Merge request reports