Put fixes that were merged over back in.
Put fixes that were merged over back in.

EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing