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