Sync'd branch releases/beta with upstream @ Wed Nov  5 20:20:34 PST 2014