Sync'd branch releases/aurora with upstream @ Thu Sep 11 14:45:45 PDT 2014