Sync'd branch releases/aurora with upstream @ Thu Oct  2 07:12:33 PDT 2014