...
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html