Sync'd branch releases/beta with upstream @ Thu Oct 30 07:32:30 PDT 2014