Sync'd branch central with upstream @ Tue Oct  7 18:35:41 PDT 2014