Sync'd branch central with upstream @ Tue Oct 28 13:04:43 PDT 2014