Sync'd branch releases/aurora with upstream @ Thu Sep  4 06:29:34 PDT 2014