Sync'd branch releases/beta with upstream @ Fri Nov  7 09:05:45 PST 2014