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