(manual: .lvclass) Merge remote-tracking branch 'origin/master' into Line-Preview

Conflicts:
	codes/DeviceVIs/Master Device/Master Device.lvclass
	codes/DeviceVIs/Pulseblaster/PrepareHWI.vi