Sync'd branch releases/beta with upstream @ Mon Nov  3 14:20:43 PST 2014