Sync'd branch releases/aurora with upstream @ Thu Oct 16 05:14:42 PDT 2014