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