Sync'd branch releases/aurora with upstream @ Thu Sep  4 05:52:14 PDT 2014