Sync'd branch releases/aurora with upstream @ Thu Sep  4 11:23:33 PDT 2014