Sync'd branch central with upstream @ Fri Oct 24 18:29:06 PDT 2014