Sync'd branch releases/aurora with upstream @ Thu Sep 18 14:50:35 PDT 2014