Sync'd branch releases/beta with upstream @ Thu Oct 30 12:37:24 PDT 2014