Sync'd branch releases/aurora with upstream @ Sat Aug 23 03:32:32 PDT 2014