Sync'd branch central with upstream @ Tue Sep  2 11:34:34 PDT 2014