Sync'd branch central with upstream @ Fri Oct 10 18:55:42 PDT 2014