Sync'd branch releases/aurora with upstream @ Thu Oct  2 12:01:36 PDT 2014