Sync'd branch releases/aurora with upstream @ Thu Oct 16 08:02:47 PDT 2014