Sync'd branch central with upstream @ Fri Oct 24 14:58:47 PDT 2014