Sync'd branch releases/aurora with upstream @ Thu Sep 18 19:01:50 PDT 2014