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