Renderer merge for 2013.10.03

Merge from time to time.