Pull changes from joshuakarjala