Sync'd branch releases/aurora with upstream @ Sat Aug 30 10:31:29 PDT 2014