Sync'd branch releases/aurora with upstream @ Thu Oct 30 10:22:44 PDT 2014