Sync'd branch releases/aurora with upstream @ Thu Oct  9 19:02:35 PDT 2014