Final bag fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	cache/reports.json
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed bugs