Sync'd branch releases/beta with upstream @ Mon Nov  3 08:26:52 PST 2014