Sync'd branch central with upstream @ Tue Sep  2 12:08:35 PDT 2014