Sync'd branch releases/aurora with upstream @ Tue Aug 26 08:01:32 PDT 2014