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