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