Sync'd branch central with upstream @ Tue Nov 11 18:06:55 PST 2014