Sync'd branch releases/aurora with upstream @ Thu Sep 18 09:20:31 PDT 2014