Sync'd branch central with upstream @ Tue Oct 21 06:48:44 PDT 2014