Sync'd branch central with upstream @ Fri Sep 19 16:58:59 PDT 2014