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