Incorporating changes from upstream OpenMSP430