Sync'd branch central with upstream @ Tue Sep  2 10:22:31 PDT 2014