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