Sync'd branch releases/beta with upstream @ Thu Oct 30 16:58:41 PDT 2014