Sync'd branch releases/aurora with upstream @ Thu Sep 25 08:17:13 PDT 2014