Sync'd branch central with upstream @ Tue Sep  9 16:29:01 PDT 2014