Sync'd branch central with upstream @ Tue Oct 21 18:47:45 PDT 2014