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