Sync'd branch releases/aurora with upstream @ Sat Aug 23 13:04:36 PDT 2014