Sync'd branch central with upstream @ Fri Oct 31 15:53:33 PDT 2014