Sync'd branch releases/aurora with upstream @ Thu Sep 25 15:14:36 PDT 2014