Sync'd branch releases/aurora with upstream @ Thu Sep 25 07:11:34 PDT 2014