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