Merged Master into Line-Preview

Had to manually choose master\Master Device.lvclass. I don't think
anything changed there at all...
Previous merge resulted in corrupt .lvclass

I reverted to the Master Device.lvclass from Line-Preview instead of
taking the one from master.