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