Revert "merged master into my branch."

This reverts commit d8927d646950f9440a0e87fc8c3c8e661932af14.