Sync'd branch releases/aurora with upstream @ Fri Aug 29 08:36:30 PDT 2014