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