Sync'd branch central with upstream @ Tue Sep 23 16:21:40 PDT 2014