Sync'd branch central with upstream @ Tue Sep 23 15:31:45 PDT 2014