Merge branch 'master' into power_calibration

Conflicts:
	MAIN.dfm
Resolution:
        My brilliant plan to convert the .dfm files
to plain text failed, because the comment parent of
the two was still binary, so git couldn't auto-merge.
Manually merging was easy enough.