Sync'd branch central with upstream @ Sun Aug 31 18:19:30 PDT 2014