Sync'd branch releases/aurora with upstream @ Thu Oct 16 07:32:40 PDT 2014