Sync'd branch central with upstream @ Fri Aug 22 16:40:32 PDT 2014