Plux merge for lulz

hai