Merge branch 'master' into OPM-reports

Conflicts:
	custom/opm/opm_reports/beneficiary.py