Sync'd branch releases/aurora with upstream @ Thu Oct  2 18:40:33 PDT 2014