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