Sync'd branch central with upstream @ Tue Oct 28 18:59:43 PDT 2014