Sync'd branch central with upstream @ Tue Sep  9 16:13:39 PDT 2014