Sync'd branch central with upstream @ Fri Oct 10 19:01:40 PDT 2014