Sync'd branch releases/beta with upstream @ Thu Oct 30 06:10:33 PDT 2014