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