Sync'd branch releases/aurora with upstream @ Thu Oct  2 19:32:34 PDT 2014