Sync'd branch releases/beta with upstream @ Thu Nov  6 16:31:55 PST 2014