Merge origin/master

Conflicts:
	Bounties/paper/report.log
	Bounties/paper/report.synctex.gz
	Bounties/paper/report.tex