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