Sync'd branch central with upstream @ Wed Sep 10 15:06:37 PDT 2014