Sync'd branch central with upstream @ Wed Nov 12 17:21:01 PST 2014