Sync'd branch releases/aurora with upstream @ Thu Sep 11 17:38:34 PDT 2014