Sync'd branch releases/aurora with upstream @ Thu Oct  9 17:17:46 PDT 2014