Sync'd branch releases/aurora with upstream @ Thu Sep 11 14:08:49 PDT 2014