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