Sync'd branch releases/beta with upstream @ Thu Nov  6 09:40:12 PST 2014