Merge Testing branch and master again

Eclipse git plugin still committed to the test branch. changing.