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