Sync'd branch releases/aurora with upstream @ Fri Aug 29 12:16:31 PDT 2014